Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 24 Jul 2021 11:58:23 +0000 (13:58 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 24 Jul 2021 11:58:23 +0000 (13:58 +0200)

Trivial merge